Remove scraggling conflict marker.
authorrobertl <robertl>
Wed, 19 Nov 2008 04:23:53 +0000 (04:23 +0000)
committerrobertl <robertl>
Wed, 19 Nov 2008 04:23:53 +0000 (04:23 +0000)
commit00fe68acc7b67999ac59c8c8dc4c2ff44423be26
treed8dba581c4cd0cac88c374eb76fcfc1cfc1a88db
parent5d17bd4e992a6dabacb2fd55b57ec1eb51703800
Remove scraggling conflict marker.
testo